(fill-single-word-nobreak-p): Allow breaking before

last word, if it's not the end of the paragraph.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad79e1423a586050583f526695495d68ad451f87..d4adce039df3a25026afe4aafe397f3eb658dd58 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * textmodes/fill.el (fill-single-word-nobreak-p): Allow breaking before
+       last word, if it's not the end of the paragraph.
+
        * files.el (abbreviate-file-name): Don't mistakenly match newlines in
        file name.
 

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 95f73b569521c5b0313457eb5bda07ce24b65403..af97ca83e6e1b089172eb4b8b2b4c1e9c5e981af 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -292,7 +292,9 @@ act as a paragraph-separator."
 
 (defun fill-single-word-nobreak-p ()
   "Don't break a line after the first or before the last word of a sentence."
-  (or (looking-at (concat "[ \t]*\\sw+" "\\(?:" (sentence-end) "\\)"))
+  ;; Actually, allow breaking before the last word of a sentence, so long as
+  ;; it's not the last word of the paragraph.
+  (or (looking-at (concat "[ \t]*\\sw+" "\\(?:" (sentence-end) "\\)[ \t]*$"))
       (save-excursion
        (skip-chars-backward " \t")
        (and (/= (skip-syntax-backward "w") 0)